Fix some more text inconsistencies and put devices in a more sensible order.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/Kconfig b/linux-2.6-xen-sparse/drivers/xen/Kconfig
index 701e79529911882923bd486b859d581233a19385..39d316205a1f3b255fa0581afefab54e25f83fcd 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig
@@ -33,6 +33,11 @@ config XEN_PRIVCMD
        depends on PROC_FS
        default y
 
+config XEN_XENBUS_DEV
+       bool
+       depends on PROC_FS
+       default y
+
 config XEN_BACKEND
         tristate "Backend driver support"
         default y
@@ -40,46 +45,6 @@ config XEN_BACKEND
           Support for backend device drivers that provide I/O services
           to other virtual machines.
 
-config XEN_PCIDEV_BACKEND
-       tristate "PCI device backend driver"
-       depends on PCI && XEN_BACKEND
-       default XEN_PRIVILEGED_GUEST
-       help
-         The PCI device backend driver allows the kernel to export arbitrary
-         PCI devices to other guests. If you select this to be a module, you
-         will need to make sure no other driver has bound to the device(s)
-         you want to make visible to other guests.
-
-choice
-       prompt "PCI Backend Mode"
-       depends on XEN_PCIDEV_BACKEND
-       default XEN_PCIDEV_BACKEND_VPCI
-
-config XEN_PCIDEV_BACKEND_VPCI
-       bool "Virtual PCI"
-       ---help---
-         This PCI Backend hides the true PCI topology and makes the frontend
-         think there is a single PCI bus with only the exported devices on it.
-         For example, a device at 03:05.0 will be re-assigned to 00:00.0. A
-         second device at 02:1a.0 will be re-assigned to 00:01.0.
-
-config XEN_PCIDEV_BACKEND_PASS
-       bool "Passthrough"
-       ---help---
-         This PCI Backend provides a real view of the PCI topology to the
-         frontend (for example, a device at 06:01.b will still appear at
-         06:01.b to the frontend). This is similar to how Xen 2.0.x exposed
-         PCI devices to its driver domains. This may be required for drivers
-         which depend on finding their hardward in certain bus/slot
-         locations.
-
-endchoice
-
-config XEN_PCIDEV_BE_DEBUG
-       bool "PCI Backend Debugging"
-       depends on XEN_PCIDEV_BACKEND
-       default n
-
 config XEN_BLKDEV_BACKEND
        tristate "Block-device backend driver"
         depends on XEN_BACKEND
@@ -89,13 +54,8 @@ config XEN_BLKDEV_BACKEND
          block devices to other guests via a high-performance shared-memory
          interface.
 
-config XEN_XENBUS_DEV
-       bool
-       depends on PROC_FS
-       default y
-
 config XEN_BLKDEV_TAP
-       tristate "Block device tap backend"
+       tristate "Block-device tap backend driver"
        depends on XEN_BACKEND
        default XEN_PRIVILEGED_GUEST
        help
@@ -136,6 +96,46 @@ config XEN_NETDEV_LOOPBACK
          A two-interface loopback device to emulate a local netfront-netback
          connection.
 
+config XEN_PCIDEV_BACKEND
+       tristate "PCI-device backend driver"
+       depends on PCI && XEN_BACKEND
+       default XEN_PRIVILEGED_GUEST
+       help
+         The PCI device backend driver allows the kernel to export arbitrary
+         PCI devices to other guests. If you select this to be a module, you
+         will need to make sure no other driver has bound to the device(s)
+         you want to make visible to other guests.
+
+choice
+       prompt "PCI Backend Mode"
+       depends on XEN_PCIDEV_BACKEND
+       default XEN_PCIDEV_BACKEND_VPCI
+
+config XEN_PCIDEV_BACKEND_VPCI
+       bool "Virtual PCI"
+       ---help---
+         This PCI Backend hides the true PCI topology and makes the frontend
+         think there is a single PCI bus with only the exported devices on it.
+         For example, a device at 03:05.0 will be re-assigned to 00:00.0. A
+         second device at 02:1a.0 will be re-assigned to 00:01.0.
+
+config XEN_PCIDEV_BACKEND_PASS
+       bool "Passthrough"
+       ---help---
+         This PCI Backend provides a real view of the PCI topology to the
+         frontend (for example, a device at 06:01.b will still appear at
+         06:01.b to the frontend). This is similar to how Xen 2.0.x exposed
+         PCI devices to its driver domains. This may be required for drivers
+         which depend on finding their hardward in certain bus/slot
+         locations.
+
+endchoice
+
+config XEN_PCIDEV_BE_DEBUG
+       bool "PCI Backend Debugging"
+       depends on XEN_PCIDEV_BACKEND
+       default n
+
 config XEN_TPMDEV_BACKEND
        tristate "TPM-device backend driver"
         depends on XEN_BACKEND
@@ -195,7 +195,7 @@ config XEN_SYSFS
        depends on SYSFS
        default y
        help
-               Xen hypervisor attributes will show up under /sys/hypervisor/.
+         Xen hypervisor attributes will show up under /sys/hypervisor/.
 
 choice
        prompt "Xen version compatibility"